From: Anthony PERARD Date: Thu, 12 Dec 2019 18:27:33 +0000 (+0000) Subject: Config.mk: Remove unused setvar_dir macro X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~1058 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=27d3ea41e67c4161c91359cef24ef415a5dd2163;p=xen.git Config.mk: Remove unused setvar_dir macro And remove all mention of it in docs. It hasn't been used since 9ead9afcb935 ("Add configure --with-sysconfig-leaf-dir=SUBDIR to set CONFIG_LEAF_DIR"). Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- diff --git a/Config.mk b/Config.mk index 54e4b7091b..8768398d5e 100644 --- a/Config.mk +++ b/Config.mk @@ -68,17 +68,6 @@ DEPS_RM = $(DEPS) $(DEPS_INCLUDE) include $(XEN_ROOT)/config/$(XEN_OS).mk include $(XEN_ROOT)/config/$(XEN_TARGET_ARCH).mk -# arguments: variable, common path part, path to test, if yes, if no -define setvar_dir - ifndef $(1) - ifneq (,$(wildcard $(2)$(3))) - $(1) ?= $(2)$(4) - else - $(1) ?= $(2)$(5) - endif - endif -endef - ifneq ($(EXTRA_PREFIX),) EXTRA_INCLUDES += $(EXTRA_PREFIX)/include EXTRA_LIB += $(EXTRA_PREFIX)/lib diff --git a/docs/misc/distro_mapping.txt b/docs/misc/distro_mapping.txt index 2e46592728..599b6fd1e9 100644 --- a/docs/misc/distro_mapping.txt +++ b/docs/misc/distro_mapping.txt @@ -9,9 +9,8 @@ INITD_DIR | /etc/rc.d/init.d | /etc/init.d | /etc/init.d | -----------------+------------------+---------------+----------------+ The existence of these directories are tested at build-time (on the -build host, via the "setvar_dir" macro in Config.mk) and for some -scripts at run-time. If the Red Hat directory exists, it is used; -otherwise the Debian one is used. +build host) and for some scripts at run-time. If the Red Hat +directory exists, it is used; otherwise the Debian one is used. The INITD_DIR path can be changed with configure --with-initddir=DIR. The CONFIG_LEAF_DIR name can be changed with configure